(tmm-get-keymap): Ignore any command now disabled for menus.

diff --git a/lisp/tmm.el b/lisp/tmm.el
index 3ca00def6e1a4407dcc9eadaa4d3847c6d81fb63..35630aa6d5ae8d0150ea2d54a5c550c6ec6efb06 100644 (file)
--- a/lisp/tmm.el
+++ b/lisp/tmm.el
@@ -426,6 +426,11 @@ It uses the free variable `tmm-table-undef' to keep undefined keys."
                   (setq str event event nil km (cons 'keymap elt))
                   )))
       (and km (stringp km) (setq str km))
+      ;; Verify that the command is enabled;
+      ;; if not, don't mention it.
+      (when (and km (symbolp km) (get km 'menu-enable))
+       (unless (eval (get km 'menu-enable))
+         (setq km nil)))
       (and km str
           (or (assoc str tmm-km-list)
               (setq tmm-km-list